From 412d3c3b4ff150b3efd889e1d0ce5bc3c77cfc46 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 12 Nov 2014 13:12:02 +0100 Subject: [PATCH] Fix OUT_DIR not being passed to rustdoc --- src/cargo/ops/cargo_rustc/mod.rs | 11 ++++++++++- tests/test_cargo_compile_custom_build.rs | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 89f4217da..fef32aff2 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -481,7 +481,16 @@ fn rustdoc(package: &Package, target: &Target, None => {} } - let rustdoc = try!(build_deps_args(rustdoc, target, package, cx, kind)); + let mut rustdoc = try!(build_deps_args(rustdoc, target, package, cx, kind)); + + let has_build_cmd = package.get_targets().iter().any(|t| { + t.get_profile().is_custom_build() + }); + rustdoc = rustdoc.env("OUT_DIR", if has_build_cmd { + Some(cx.layout(package, kind).build_out(package)) + } else { + None + }); log!(5, "commands={}", rustdoc); diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs index e11dfa6f1..338c5809e 100644 --- a/tests/test_cargo_compile_custom_build.rs +++ b/tests/test_cargo_compile_custom_build.rs @@ -818,6 +818,9 @@ test!(code_generation { {running} `target[..]foo` Hello, World! ", compiling = COMPILING, running = RUNNING).as_slice())); + + assert_that(p.cargo_process("test"), + execs().with_status(0)); }) test!(release_with_build_script { -- 2.30.2